x86: Fix build error after c/s 20969:8cb6e7eff2ba

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 932ff43a69c368a7380ad42eb4a05a2a07c13722..1238e9cb965f87a5f01e53edb076348c392ed1e0 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -892,8 +892,7 @@ asmlinkage void do_invalid_op(struct cpu_user_regs *regs)
 {
     struct bug_frame bug;
     struct bug_frame_str bug_str;
-    const void *p;
-    const char *filename, *predicate, *eip = (char *)regs->eip;
+    const char *p, *filename, *predicate, *eip = (char *)regs->eip;
     unsigned long fixup;
     int id, lineno;
 
@@ -928,7 +927,7 @@ asmlinkage void do_invalid_op(struct cpu_user_regs *regs)
 
     if ( id == BUGFRAME_run_fn )
     {
-        const void (*fn)(struct cpu_user_regs *) = p;
+        void (*fn)(struct cpu_user_regs *) = (void *)p;
         (*fn)(regs);
         regs->eip = (unsigned long)eip;
         return;